Fix after core #8157#486
Merged
AWSHurneyt merged 3 commits intoopensearch-project:mainfrom Jul 13, 2023
Merged
Conversation
Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Codecov Report
@@ Coverage Diff @@
## main #486 +/- ##
============================================
+ Coverage 74.47% 74.48% +0.01%
+ Complexity 861 859 -2
============================================
Files 129 129
Lines 5598 5597 -1
Branches 684 684
============================================
Hits 4169 4169
+ Misses 1125 1124 -1
Partials 304 304
|
bowenlan-amzn
requested review from
AWSHurneyt,
eirsep,
getsaurabh02,
lezzago,
qreshi,
rishabhmaurya,
sbcd90 and
tlfeng
as code owners
lezzago
approved these changes
Jul 13, 2023
AWSHurneyt
approved these changes
Jul 13, 2023
Contributor
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-486-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 003071c50e5cf08f7489f4940e0f1e7092ade1d8
# Push it to GitHub
git push --set-upstream origin backport/backport-486-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.xThen, create a pull request where the |
Contributor
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.9 2.9
# Navigate to the new working tree
cd .worktrees/backport-2.9
# Create a new branch
git switch --create backport/backport-486-to-2.9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 003071c50e5cf08f7489f4940e0f1e7092ade1d8
# Push it to GitHub
git push --set-upstream origin backport/backport-486-to-2.9
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.9Then, create a pull request where the |
Merged
3 tasks
Contributor
|
core was backported to 2.x, opensearch-project/OpenSearch#8782, we need this backport to 2.x also. I do the manual backport for 2.x, #499 |
Hailong-am
pushed a commit
to Hailong-am/common-utils
that referenced
this pull request
Jul 21, 2023
* Fix after core #8157 Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> * Fix ktlint issue Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> * Fix spotless java check Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> --------- Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> (cherry picked from commit 003071c)
Hailong-am
pushed a commit
to Hailong-am/common-utils
that referenced
this pull request
Jul 21, 2023
* Fix after core #8157 Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> * Fix ktlint issue Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> * Fix spotless java check Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> --------- Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> (cherry picked from commit 003071c) Signed-off-by: Hailong Cui <ihailong@amazon.com>
bowenlan-amzn
added a commit
that referenced
this pull request
Jul 22, 2023
* Fix after core #8157 * Fix ktlint issue * Fix spotless java check --------- (cherry picked from commit 003071c) Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> Signed-off-by: Hailong Cui <ihailong@amazon.com> Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com>
AWSHurneyt
pushed a commit
to AWSHurneyt/common-utils
that referenced
this pull request
Apr 12, 2024
* Fix after core #8157 * Fix ktlint issue * Fix spotless java check --------- (cherry picked from commit 003071c) Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> Signed-off-by: Hailong Cui <ihailong@amazon.com> Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com> Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
opensearch-project/OpenSearch#8157
Issues Resolved
[List any issues this PR will resolve]
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.